From: Jason Rumney <jasonr@gnu.org>
Date: Thu, 14 Jan 2010 14:19:01 +0000 (+0800)
Subject: Merge from trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8651^2~6
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3b1ddcc80f2e5330ee7f855aecfe5124374ec43c;p=emacs.git

Merge from trunk
---

3b1ddcc80f2e5330ee7f855aecfe5124374ec43c